Merge remote-tracking branch 'origin/android-msm-angler-3.10-security-next' into android-msm-angler-3.10

September 2018.2

Bug: 110909997
Bug: 111785512