Merge Android 12

Bug: 202323961
Merged-In: I745c30269d26b5bef2e5330b565db0cffa3712f5
Change-Id: I96eb8bfee54e9eea557b016ba1a8cc62baba6d02