Android 7.1.2 Release 0.26 (N2G48C,angler)
Merge android-msm-angler-3.10-nyc-mr2-security-next into android-msm-angler-3.10-nyc-mr2

August 2017.1

Bug: 62368622
Change-Id: I3df095e1732993310b28820c39435dd032f15f0e