Merge Android 12

Bug: 202323961
Merged-In: Ia571072792fc796184b306ed8a46507db8d12959
Change-Id: Ifa6d069afec7821c91b06f5afd5f909aac36c4bc