Merge Android 12 QPR1

Bug: 210511427
Merged-In: I855f1f0b6bd10d54941d56889eb6b025ac11a693
Change-Id: I559ed2e77a5f4ec312500c5e19fec997726995e7