Merge "Fix FakeUid implementation"

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

@@ -362,6 +362,16 @@ public class FakeUid extends Uid {
         return null;
     }
 
+    @Override
+    public long getCpuActiveTime() {
+        return 0;
+    }
+
+    @Override
+    public long[] getCpuClusterTimes() {
+        return null;
+    }
+
     @Override
     public long[] getCpuFreqTimes(int procState, int which) {
         return null;