Merge "Adding new methods to FakeUid."

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

@@ -153,6 +153,11 @@ public class FakeUid extends Uid {
         return 0;
     }
 
+    @Override
+    public Timer getWifiScanTimer() {
+        return null;
+    }
+
     @Override
     public int getWifiScanBackgroundCount(int which)  {
         return 0;
@@ -168,6 +173,11 @@ public class FakeUid extends Uid {
         return 0;
     }
 
+    @Override
+    public Timer getWifiScanBackgroundTimer() {
+        return null;
+    }
+
     @Override
     public long getWifiBatchedScanTime(int csphBin, long elapsedRealtimeUs, int which) {
         return 0;