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

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