Merge "Statsd CTS: remove BluetoothActivityInfo" into pi-dev