Merge Android 12

Bug: 202323961
Merged-In: I1741e057ca61ff0f9e8068b96bf71903a54ae775
Change-Id: I662b8cbdf8ecdc198b1e0be2fa768ccbc1c78dd0