Android VTS 8.1 Release 11 (6166617)
release-request-c9e3b153-009d-4386-b83e-337752602795-for-git_oc-mr1-release-4111654 snap-temp-L22900000075285650

Change-Id: Ia502b5791cde6a28760fe9d69165f777a8e5da1e