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

Bug: 199698959
Signed-off-by: Roger Liao <[email protected]>
Change-Id: Ib24ce001e981198ad52c7686a64461f8d5fdeec5