Merge branch 'android-msm-pixel-4.9-sc-security' into android-msm-pixel-4.9-sc-v2

Mar 2022.1

Bug: 204107016
Change-Id: I86e8bf9bd4d7d387ef1e7439ee986f4afe7a3850