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

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