Merge Android 12

Bug: 202323961
Merged-In: I96fe6556a3c305b80013b9523089c26ecbf9ffd8
Change-Id: Ibb0c4ec3ac428d0c87c5c31008863ed72c31df0e