Merge Android 12 QPR1

Bug: 210511427
Merged-In: Id0a35797d5016e3fb3f8d58a75ff84a55eb413e7
Change-Id: I476f7b38e32a844698f17a28155287422f17c425