Merge Android 12

Bug: 202323961
Merged-In: Ife18fca3918a305ea69865f385e690a871facb1e
Change-Id: Id04533782a106c47770bb3d7f7a0215b425adf87