Merge Android 12

Bug: 202323961
Merged-In: If0edbee7302760c9d84d1ddafd1b5c82114af237
Change-Id: Icb33622b7f97e5fcec6a90eb37201ec4d38d086c