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

March 2018.1
Change-Id: Ice243e35cad9f32e9ab30bc007f00440bae25aff