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

September 2017.2

Bug: 63174519
Change-Id: Ia1361c5864cdb431810e4a8f8e69df7b6d542e7e