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

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