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

Change-Id: I7473b512a760849117369d07ea22314552cae2b5
Signed-off-by: Roger Liao <rogerliao@google.com>