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

May 2018.1
Bug: 74402703
Change-Id: Ied982cac355a94c0e2b6367b0831cc17e3617988
Signed-off-by: Siyuan Zhou <siyuanzhou@google.com>