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

SBMerger: 410055097
Change-Id: Idb42304ff47bbd4e71797aa9c6b8d9b7931e35d2
Signed-off-by: SecurityBot <[email protected]>