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: I2718b5576ad65635f672bb019de9cf77b7d162d1