Android CTS 8.1 Release 9 (4983507)
Merge "Snap for 4726689 from b216e0eab7537138fdef5fcb9e4b17c45e82737e to oreo-mr1-cts-release" into oreo-mr1-cts-release