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

December 2018.1

Bug: 117289320
Change-Id: I410ab26da833e4bcf3b7900b270774a3b9953f20
Signed-off-by: Siqi Lin <siqilin@google.com>