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

Change-Id: I9c5762289f1dcd2fafff1218c507494a571d9ef5