Merge Android 12L

Bug: 222710654
Merged-In: I8bbf321498d25aca1d427d930dba0204391f704b
Change-Id: Icac31514b137d098e0733238c74ec27af8cf7666