Android 8.1.0 release 42
Snap for 4657601 from 3d6df4550cc0f84eef67af0ec31329d3db064a01 to oc-m4-release

Change-Id: I3cf41321351e6c97768867de3154a5d9b1bf45bd