Merge Android 12

Bug: 202323961
Merged-In: I12744f0ee5582787557ffca0f440bb3308a845cd
Change-Id: Ib78b88e82470d3dcbfbf282cdd6a2bd85a799494