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

May 2022.1

Bug: 218985046
Change-Id: I8ae1afc1ffae67ba7df9cfdd529b04d966354bac