Merge Android 12 QPR1

Bug: 210511427
Merged-In: Ib836574268ae722da7a06d53d2014daa5877a991
Change-Id: Ic04e8e0274868bc7ccf3ac454ed0217beff382a0