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