Merge Android 12

Bug: 202323961
Merged-In: I6f522d6d244351a294cfa10defa2744cf5f16564
Change-Id: I4b7101bc5f107cb39a290672951b7c36cbc41840