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

April 2018.2

Bug: 73499097
Bug: 74613955

Signed-off-by: Siyuan Zhou <siyuanzhou@google.com>
Change-Id: I64a0f16c6819803ffdd19ecc1d6fd12c3b97f72a