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

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