Merge Android 12

Bug: 202323961
Merged-In: I976aab264b5da4091d26c0ade453a0e8adaba5be
Change-Id: I48a700bee04850458185184adf0d51e8ae3b9ea1