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

Change-Id: Ica185ae631340304fdb2affef890cec7971b2310