Merge Android 12 QPR1

Bug: 210511427
Merged-In: I365f7674b156509a47aebcf455d31b91cdf0978f
Change-Id: I133238a8bcbbd048f053234cddd5d2bdd61a278e