Android 8.1.0 release 21
Snap for 4448085 from cdf70685d7796990df03b765c012174a86814bf5 to oc-m3-release

Change-Id: I5d10d1775e8321b522b636da1a71d3fd691fef87