Merge Android 12L

Bug: 222710654
Merged-In: I968601ea0aef02f03ecfc0d09049efb13ecda483
Change-Id: Id0f3e29ce8772922c061164a5a049e4ead262196