Merge tag 'android-8.1.0_r30' into lineage-15.1

Android 8.1.0 release 30

* tag 'android-8.1.0_r30':
  DO NOT MERGE: Updating security string for oc-mr1-dev to 2018-06-05
  Version bump to OPM2.171026.006
  Version bump to OPM2.171026.005
  Version bump to OPM2.171026.004
  Update Security String to 05-05 on release branch (cherry picked from commit 15d6d5502cb5eb2b2054c8baecadccc4422854c9)
  DO NOT MERGE Updating security string for oc-dev to 2018-05-01

Change-Id: Ib5a40349a68572db21613ca441cda87a37390b30