Merge "Update FakeUid with new methods"

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

@@ -141,6 +141,21 @@ public class FakeUid extends Uid {
         return 0;
     }
 
+    @Override
+    public int getWifiScanBackgroundCount(int which)  {
+        return 0;
+    }
+
+    @Override
+    public long getWifiScanActualTime(long elapsedRealtimeUs)  {
+        return 0;
+    }
+
+    @Override
+    public long getWifiScanBackgroundTime(long elapsedRealtimeUs)  {
+        return 0;
+    }
+
     @Override
     public long getWifiBatchedScanTime(int csphBin, long elapsedRealtimeUs, int which) {
         return 0;
@@ -275,6 +290,11 @@ public class FakeUid extends Uid {
         return null;
     }
 
+    @Override
+    public Timer getBluetoothScanBackgroundTimer() {
+        return null;
+    }
+
     @Override
     public long getWifiRadioApWakeupCount(int which) {
         return 0;