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

SBMerger: 410055097
Change-Id: Ic816f82f5c85093c8628757161ad016c11b0ed11
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
tree: 17e8694cdb89ba64e8bdde4058251b53b2f85938
  1. include/
  2. samsung/