Merge Android 12L

Bug: 222710654
Merged-In: I0f76e316e9e7f504b92e157799074e4c5606adbf
Change-Id: Idad44c9d2adeb6207c021dcf5aa29049fee9020e