Merge Android 12

Bug: 202323961
Merged-In: I44c29c231f1ec7c6df5b7443e99486e2fa47fa0e
Change-Id: I914bf533b92877bc07d84238e03aa6fb698ba06f