Merge Android 12

Bug: 202323961
Merged-In: Ib7c026429a1147c0e26cd783a86c5376739cae70
Change-Id: I394b3170a0a2b96803f05813c65f6704c314a846