Merge branch 'android-msm-pixel-4.9-rvc-security' into android-msm-pixel-4.9-rvc

Dec 2020.1

Bug: 169729941
Change-Id: I32702a37126b3c6b1564d7b510fca534e7add446