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

October 2017.3

Bug: 64693798
Change-Id: If59ab1691ad5f887fd36e164b0ed8243e8b7d572