Merge Android 12 QPR1

Bug: 210511427
Merged-In: I404ee8c2afe5ca547526c29b0aa6e079db15bc1d
Change-Id: Iab6862177b1bb9f06d700b4758e94777957c18f8