Merge android12-gs-pixel-5.10-sc-qpr2 into android12-gs-pixel-5.10-sc-v2

SBMerger: 410055097
Change-Id: I66989517dd4f472ea5dc0cb60151e68e36df2a66
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>