Merge Android 12 QPR1

Bug: 210511427
Merged-In: I9f7a1e8d6c2971e7d1028cd331c736228de8df0d
Change-Id: I444603270a1515e6b63321a4667b806c948c6920