Android 8.1.0 Release 25 (OPM2.171019.029.A1)
release-request-108343c4-ad88-44f9-aaa2-24d8b8a5c176-for-git_oc-mr1-release-4321077 snap-temp-L97000000100182150

Change-Id: I22f3362fa654ed184436565aa24bd2564f724d26