Merge Android 12

Bug: 202323961
Merged-In: I6bd6f579d7d5e0f47e77a1e3505e3ad913d0fe06
Change-Id: I9be0e17a0e75119b6df3d824439784f9b3889d24