Merge Android 12

Bug: 202323961
Merged-In: I000fad1ecc527f6de8cbd0ce812e08ab7a8ae9d1
Change-Id: Ia23e7c135d66e8bc0af713c13323de59fec9b4b3