Merge Android 12L

Bug: 222710654
Merged-In: I433a20010d6eb1ad3aca45d7e4b663510f1b023d
Change-Id: Id22b3420860b9aaa86f2d2a679efeb107ab5ef99