Android O MR1 Preview 2 Release 0.1 (OPP6.171019.012,angler)
Merge branch 'android-msm-angler-3.10-oc' into android-msm-angler-3.10

December 2017.1

Bug: 67749245
Change-Id: I3cc87859f6679d5c91a622d101a172f2a0598520