Merge remote-tracking branch 'android-msm-barbet-4.19-rvc-security' into android-msm-barbet-4.19-rvc

Aug 2021.1

Bug: 189715888
Bug: 189715042
Change-Id: I3798f624b84783365dddcbeb89dc9cdafc267736