Merge Android 12

Bug: 202323961
Merged-In: Ib3add5564057415ef6f968d017deb806de48c397
Change-Id: If1250d771351d391f04404dfac85571c6ceb8126