Merge "BatteryStats: Don't log BluetoothScanTimer when it doesn't exist" into nyc-dev