Merge "Add aggregated partial wakelock time per uid" into oc-dev

am: 11e7781b32

Change-Id: I17641683c8d6ec278070ebbafaefce35008248f0

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

@@ -44,6 +44,11 @@ public class FakeUid extends Uid {
         return null;
     }
 
+    @Override
+    public Timer getAggregatedPartialWakelockTimer() {
+        return null;
+    }
+
     @Override
     public ArrayMap<String, ? extends Timer> getSyncStats() {
         return null;