Android 8.1.0 release 47
Snap for 4417144 from cdf70685d7796990df03b765c012174a86814bf5 to oc-m2-release

Change-Id: I56c624846cd5951c76d3437ba8d09ff4190c86a0