Android cts 8.1 release 25
Merge "Snap for 4726689 from 5c8518b598845429832d3ac5cda3b352688bfcd0 to oreo-mr1-cts-release" into oreo-mr1-cts-release