Merge Android 12

Bug: 202323961
Merged-In: I3b3ef768bb004daf8222e4171b72b02bb76497ab
Change-Id: I8e55721c6f5a3e85af63ed0721ebefd72adf235d