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

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