Merge Android 12L

Bug: 222710654
Merged-In: I96d980917fd755eef982c175df50852e129d5e83
Change-Id: I3b8e6c4388715577e6ec83527a8342cbda46867d