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

Jan 2022.1

Bug: 204278602
Change-Id: If0896ff2c81f88271be9ac79679b62e13fac3fd9