Merge Android 12L

Bug: 222710654
Merged-In: I367438214a7649cade2396b48ed3efb14b564075
Change-Id: I78e650920f9cf47c1eaaa259103f8f95d3368f4c