Android cts 8.1 release 25
Merge "Snap for 7423556 from 1f358638e9fc7459c848b419736ae3cca8d2a876 to oreo-mr1-cts-release" into oreo-mr1-cts-release