Merge branch 'android-msm-barbet-4.19-sc-security' into android-msm-barbet-4.19-sc-v2 Mar 2022.1 Bug: 204107400 Change-Id: Ia35cd4ccbbaeb1e771575f2bcf8adb42658ae9d7