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

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