Merge Android 12

Bug: 202323961
Merged-In: Ib2eab0f24b001763f292b8e5fa62a132ae63f9e6
Change-Id: I2f6777e91e934269c71c914db8621298a451fceb