Merge "Turn on power accounting in AOSP" into oc-dev

am: 0a6d61883c

Change-Id: I9204d0b51db9fedbf2f49b5d635e46b221c5d7ea

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

@@ -77,11 +77,11 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
 
     @Override
     public boolean isAdvancedUiEnabled() {
-        return false;
+        return true;
     }
 
     @Override
     public boolean isPowerAccountingToggleEnabled() {
-        return false;
+        return true;
     }
 }