Android CTS 8.1 Release 12 (5131724)
Merge "Snap for 4615400 from 76bca556316ac96c3260122f2a11d05bb0eccb15 to oreo-mr1-cts-release" into oreo-mr1-cts-release