Android 8.1.0 Release 4 (OPM1.171019.013)
Merge cherrypicks of [3286450, 3287029, 3286843] into oc-mr1-release

Change-Id: I5cec36d79e3f3fd30c7a50faf251ec280e858945