Android 8.1.0 Release 40 (OPM4.171019.021.R1)
Snap for 4657601 from 40ffdef40036342572382e40329fed5bc5b24f89 to oc-m4-release

Change-Id: If6ceb741465248bfb9400ac08572a90255211366