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

Bug: 199698959
Signed-off-by: Robin Peng <[email protected]>
Change-Id: I95912d757760915945fdb477ba98e13ce10e61d1