Android 8.1.0 release 20
Snap for 4402310 from a4f727d733bf764a62a9f25ad51ef12db2ac8c86 to oc-m2-release

Change-Id: I9f18fdc2c00596cd40c2114feb7c8407849f5e79