Merge \\"Update FakeUid with new methods\\" into nyc-mr1-dev am: 30bef0a063

am: fe8e89e2fc

Change-Id: Ifb8f9e5773619509122b5a982b950da90e0d4381

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

@@ -274,4 +274,14 @@ public class FakeUid extends Uid {
     public Timer getBluetoothScanTimer() {
         return null;
     }
+
+    @Override
+    public long getWifiRadioApWakeupCount(int which) {
+        return 0;
+    }
+
+    @Override
+    public long getMobileRadioApWakeupCount(int which) {
+        return 0;
+    }
 }