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

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