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

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