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

August 2018.1

Bug: 80191245
Change-Id: I9e764529ca03931d029685270567fbdf320b1337
Signed-off-by: David Lin <dtwlin@google.com>