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

Signed-off-by: Robin Peng <robinpeng@google.com>
Change-Id: I31fecdfcd76965cbad32134b43c887bd11129c15