Merge android-gs-pixel-5.10 into android12-gs-pixel-5.10-sc

Bug: 194964579
Change-Id: Ia87d2145866813ce80a273be491c2e97324ebf52
Signed-off-by: Aaron Ding <aaronding@google.com>