Merge Android 12 QPR1

Bug: 210511427
Merged-In: I7a7c71438880823616a1e696dde71fbfc25a9375
Change-Id: Ib482ee7806ffe5187ff7d10ba96d83112dcf40bf