Merge Android 12

Bug: 202323961
Merged-In: I9073b1d993316cc77947ac1ede4bd33a05f0960e
Change-Id: I08e98f2c2f209f144b6770729ebd25cbc1f41db6