Merge Android 12 QPR1

Bug: 210511427
Merged-In: I5d832993fcd8f5e2b678d0802ca0f33747ae5e07
Change-Id: Ie0a307c3141b678fdf1a89795d52b41aed4f6629