Android 8.1.0 release 30
Snap for 4402310 from a2fd465bf33d106e5268b65d6d75591cb69f1732 to oc-m2-release

Change-Id: I9ac2998013a670af442de6de79482a680f89756c