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

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