Merge Android 12

Bug: 202323961
Merged-In: I7f3a5953100762858d24643624e437854c390d99
Change-Id: I770f88f62926e72ca776010c86efa3c60b4b9059