Merge "Update FakeUid with energy to charge change" into sc-dev am: 8625648a88

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13598823

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9191d52864deb309c878c616a5bcc18df1c8f7c9

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

@@ -356,12 +356,12 @@ public class FakeUid extends Uid {
     }
 
     @Override
-    public long getScreenOnEnergy() {
+    public long getScreenOnMeasuredBatteryConsumptionUC() {
         return 0;
     }
 
     @Override
-    public long[] getCustomMeasuredEnergiesMicroJoules() {
+    public long[] getCustomConsumerMeasuredBatteryConsumptionUC() {
         return null;
     }