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

Jan 2022.1

Bug: 204278602
Change-Id: I6098535187114d6ca3657603efe33f00709f3162