Merge Android 12L

Bug: 222710654
Merged-In: I047833628888634e24ac2738a459ad00aea75754
Change-Id: I38929d8dcddbc5069653a263c333b787d501fdbb