Merge branch 'android-msm-angler-3.10-security-next' into android-msm-angler-3.10

March 2018.1
Change-Id: I88bed6a83a528b73b1bc5cfea849af2e31a49898