Merge Android 12 QPR1

Bug: 210511427
Merged-In: Id03b97cc6d3651627cbfda9d09ce4fe8be9f8ec9
Change-Id: Ie53d636bf39b7101eb9dceac54909a5947a30a1a