Android CTS 8.1 Release 12 (5131724)
Merge "Snap for 5126674 from 4ef1e73f9fcac8f201f36025c9e5814cd2eb53e6 to oreo-mr1-cts-release" into oreo-mr1-cts-release