Merge Android 12

Bug: 202323961
Merged-In: I92a002aa926d8d48637e35b26c41ef65026e8eed
Change-Id: I94822b1d4c596806cf27bb3944ea1d0e5d7ac85f