Android CTS 8.0 Release 7 (4624670)
Merge "Snap for 4624340 from f247fa98171dc4078786ba6367d6e08861cf6310 to oreo-cts-release" into oreo-cts-release