Merge Android 12 QPR1

Bug: 210511427
Merged-In: Ic5d56619c6d4baea7610bfe80293cb8616acbd47
Change-Id: I48bdd4fd0b10fbd34ebce5b22770648b1c9ade43