Merge Android 12 QPR1

Bug: 210511427
Merged-In: I3d5b68befe702ce9c13ebb01e6015a6c5b008a2f
Change-Id: I8554971afebbf7ca6fd8e2426b6fb0208f64f605