Merge Android 12L

Bug: 222710654
Merged-In: I5929c021e25cfda8574e9691b267733d598ddc09
Change-Id: I3f270cc82ae4d37562fc7bc435becf0deda59ff9