Merge Android 12

Bug: 202323961
Merged-In: Ia8ce9aa9ac82c0b9903b4902c5b8f42b31dd1dac
Change-Id: Iad3364a348382ca1db350b0d9110630e3c6e4b40