Merge Android 12 QPR1

Bug: 210511427
Merged-In: I5074682bf8e701e24b7bd2b9a195e51e7e5b14dc
Change-Id: I1a4dcc260055d3208db1c700b618c3236cc5d1e7