Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: I2ad173ddded3c865cf78794a5f218cfc8a89c16b
Change-Id: I7dec123a77ddc4c30af22ba80a8d0ddbc308857b