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

Bug: 199698959
Change-Id: I1df60b87629cb680a897c3ad9ce96cb539d6edf4
Signed-off-by: Alex Hong <[email protected]>
Signed-off-by: Jack Wu <[email protected]>