Android CTS 8.1 Release 3 (4624669)
release-request-68cc9b2a-98ae-4fbf-8b56-3e535855f399-for-git_oc-mr1-release-4269864 snap-temp-L25700000092502312

Change-Id: I83ff0a1e3a3e858fde7d186060482af0c3bbebcb