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

Bug: 199698959
Change-Id: Icdc5124c3c569cda12ca32969da419970e144735
Signed-off-by: Alex Hong <rurumihong@google.com>