Merge Android 12L

Bug: 222710654
Merged-In: I03636e6b8b4dc200fcb039b99190759bc7d5e776
Change-Id: Ib9fccbbe6b6ace0a4ecddc8b84f7244e465b83b6