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

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