Merge Android 12

Bug: 202323961
Merged-In: I2ef210ed313638afa9db8004f1ebbf5508d06911
Change-Id: I00fb2e138bba6b29ee20a02edd0cc898959c1791