Merge "Add unoptimized ble scans to batterystats." into oc-dev

src/com/android/settings/fuelgauge/FakeUid.java

@@ -296,11 +296,26 @@ public class FakeUid extends Uid {
         return null;
     }
 
+    @Override
+    public Timer getBluetoothUnoptimizedScanTimer() {
+        return null;
+    }
+
+    @Override
+    public Timer getBluetoothUnoptimizedScanBackgroundTimer() {
+        return null;
+    }
+
     @Override
     public Counter getBluetoothScanResultCounter() {
         return null;
     }
 
+    @Override
+    public Counter getBluetoothScanResultBgCounter() {
+        return null;
+    }
+
     @Override
     public long getWifiRadioApWakeupCount(int which) {
         return 0;