Merge Android 12

Bug: 202323961
Merged-In: Id6088ae38b04e4587c41eed55b0a93051c4b353e
Change-Id: I5e9e6c5be2242515af9d88a6968e987cf623eff5