Android 8.1.0 Release 60 (OPM8.190105.002)
Snap for 4657601 from 9828014fd83005fbc305c535500406612b58f287 to oc-m4-release

Change-Id: Ifbf924ba3a222c8274af66e08b903b27e22f017d