Android 8.1.0 release 48
Snap for 4657601 from 5408c2c4543ec221d39aadda06b79efb3119c7b8 to oc-m4-release

Change-Id: Idaa5d7f04393a755956ce0a9de0c9fd9e8091ebe