Merge Android 12L

Bug: 222710654
Merged-In: Iecbabd04c98737c2732dc72649dfc18ee7c17f6a
Change-Id: I43b73b9b9878da8df0227c09169bbedb33ed3208