Merge Android 12 QPR1

Bug: 210511427
Merged-In: I484c7f554ebf0f3e0ff56100b50c9e5fe80f772e
Change-Id: I7e19e0360a76aef9c8e5b6a2cef4c2b020cba37c