Android 8.0.0 Release 0.29 (OPR4.170623.020,bullhead)
Merge branch 'android-msm-bullhead-3.10-oc-security-next' into android-msm-bullhead-3.10-oc

December 2017.1

Bug: 67749279
Change-Id: If21721d2c33c50d2b31338fae8ec7239e1d61294