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

September 2018.1

Bug: 110909354
Change-Id: I9e764529ca03931d029685270567fbdf320e1337