Merge Android 12 QPR1

Bug: 210511427
Merged-In: I5646901310b1463cd52da34fcecfcd756a18452e
Change-Id: I2ab56347573d000ce2d0889c21e4587bf77c3c69