Merge Android 12L

Bug: 222710654
Merged-In: I6b1bc05417f924076a1707bbe32aa7320681a45e
Change-Id: Ia8adc798f3edbaca8712d3320f3aa0ee6364c5dc