Merge Android 12L

Bug: 222710654
Merged-In: Ia083bd176996cc27325c9501054ee177abb22f4d
Change-Id: I00e72ea784864df1caaaaf32c615bdac1ab5fc1f