Merge Android 12L

Bug: 222710654
Merged-In: I5c6b7898864fe125c9a274be800ad237d6e42738
Change-Id: Id4ac344a4fbed038de46a0a6e431fb90d3756aee