Android CTS 8.1 Release 7 (4855739)
Snap for 4615400 from e45b2ef6462c471dffafff255b66c72ed31f0767 to oreo-mr1-cts-release

Change-Id: Ie574e18e38ab1da8c9cadcf7a9e45408daab9a7b