Merge Android 12 QPR1

Bug: 210511427
Merged-In: Iac4194fe385a55c888040f159a89fc787cbe06d5
Change-Id: I5b49c7c004f79eb7b7f2595ac6dfde58d71856f6