Android VTS 8.1 Release 9 (5787880)
release-request-e73a0a41-91c3-4249-808e-8d196d54a344-for-git_oc-mr1-release-4273744 snap-temp-L04700000093069831

Change-Id: I147cb549ebdbd43d796c8728dcbcd6dc9226d4bc