Merge Android 12L

Bug: 222710654
Merged-In: I504cece275a216e5e849969cdb4d9502ca184593
Change-Id: I0f2516888c51831d703bf521a3d46984ecc7c120