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

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