Merge "BatteryStatsService: Fix wrong arguments passed to noteBluetoothScanStoppedFromSourceLocked."