Merge Android 12L

Bug: 222710654
Merged-In: Icf0cc432ab3a97614b27efcf6fc9d18ea423a743
Change-Id: I478c152d8d5bc197a29253e7cfc8e6016e949a77