Merge Android 12 QPR1

Bug: 210511427
Merged-In: Iae5e73b18d8885df51c1fca1ef27e277721a8237
Change-Id: Id334bdfd9f81b6ad5f97edd4c50d8df49efb4c9c