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

June 2018.1
Bug: 76444978

Change-Id: I64ca05eb268173dbb069ebf62ed8d78729b3d722