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

SBMerger: 379283923
Change-Id: Ibc8c8f76843ecbd8b314c82e1a7580ff45cc4f05
Signed-off-by: SecurityBot <[email protected]>