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

November 2017.1

Bug: 65558908
Change-Id: Ic45e38d36adb71c9d5600b86f07e8735ce31c2fe
Signed-off-by: Steve Pfetsch <spfetsch@google.com>