Merge Android 12

Bug: 202323961
Merged-In: Ie8102d7df04bacbeb8a3a66ec6ea429e31b847cd
Change-Id: I2cf4bd97b7810da83c9036084f34c8d23102a6e4