Merge Android 12 QPR 3

Bug: 236045730
Merged-In: I8564456248d0b01eb521d575ef540689c8035d3d
Change-Id: I56da73431668a2a7dc5f23dfbcdf90622c222770