Android 8.1.0 release 31
Snap for 4657601 from e2572b8190808cef3bb9869383f3d87b3900a03e to oc-m4-release

Change-Id: If1743ef0febbe9639f08e734572bb11e10ba250d