Merge android12-gs-pixel-5.10-sc-qpr2 into -sc-v2 Signed-off-by: Petri Gynther <[email protected]> Change-Id: If612c5e8dcc16fe8364a39874c91342aaf5f45ca