Merge "Remove BatteryStats Wifi transfer CTS tests" into oreo-cts-dev