Merge Android 12

Bug: 202323961
Merged-In: I50d3c3ae271f545098f7144c4c29c722f7dad08d
Change-Id: I7dc44f3776d945b2476427be52d8fec6d2e67f71