Android CTS 8.1 Release 1 (OPM1.171019.011)
Snap for 4399693 from ffe90d7852e802118af23f7fd17ad93d4cefef7e to oc-mr1-release

Change-Id: Ia3c32bbdcd49075e74f045c69eb03990766f3464