Android 8.1.0 release 20
Snap for 4384531 from b6a9b068c08c4ba684dd06a4ceebf3ddfd3ebff8 to oc-m2-release

Change-Id: Ia5490d46215086ec2d5a29f1a37acda165126c08