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

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