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