Android 8.1.0 release 47
release-request-fd631211-effa-4885-9314-559fcbd0a094-for-git_oc-mr1-release-4308825 snap-temp-L52700000098265170

Change-Id: I96316f01e6e70fc7d79efd9a0f1a5b623392c149