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

December 2018.1

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