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

Change-Id: Icf71f071a055cac2755eb697bd0a24bb6aba0fae
Signed-off-by: Roger Liao <[email protected]>