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

July 2018.1

Bug: 79366047
Change-Id: Iea614d5c3a4d82e659f4e5afe1189577852b9913
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>