Android CTS 8.0 Release 7 (4624670)
release-request-fca2b5ac-03eb-4055-a549-b4fc2b292b64-for-git_oc-release-4049993 snap-temp-L04900000068539456

Change-Id: Iecd53b6aeefcb7cd264fbb86030cfa35c223da67