Merge Android 12 QPR 3

Bug: 236045730
Merged-In: I540ce3429cb4b1b86b8554a08677679c932b05e5
Change-Id: Iba370df34ced18cf42f19dc7e1976d0b4a6b1ccf