Android 8.1.0 release 13
Snap for 4448085 from 487faf9690f60f778b50e1ac23dee254f36a626b to oc-m3-release

Change-Id: If56e8ad01713bbf7a02192f6ceba721cffd75ec8