Merge Android 12

Bug: 202323961
Merged-In: I6af7b492384112442b8f2181ee74170e212ccac2
Change-Id: Ia64cbab09d7c0497b9392a9187dc7fca08b25c09