Merge Android 12

Bug: 202323961
Merged-In: Ibbc220dfaf24fe5868af6396b9c7e0783421dacd
Change-Id: Ib5d0bdeb8c6b5fb27a48065cf13d2759aee1996d