Merge Android 12

Bug: 202323961
Merged-In: I7cd7021ec32823bc87ddce98e10158af4fcc1f3c
Change-Id: I67407cdf769d6442d155b7a87b87693edead3683