Merge branch 'android-msm-barbet-4.19-sc-security' into android-msm-barbet-4.19-sc-v2

May 2022.1

Bug: 218985673
Change-Id: I66318f5a973e2c3b7086c3ce381dcb1d2c2370e0