Merge Android 12

Bug: 202323961
Merged-In: Ic183580a33103f94f95e6b50f3f6b2db3d9fd0e9
Change-Id: I627dfefbd9c6e0bf5760f47a5ffb40578ef5a8b6