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

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