Android 8.1.0 Release 18 (OPM5.171019.017)
Merge cherrypicks of [3509911] into oc-m5-release

Change-Id: Id7806920198a89e7d53ea9f973386179bfa3fe48