Remove uses of deprecated class BatterySipper

also, remove the obsolete class FakeUid

Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: I2f235a18dcca3b5b3a2839408b76553bbc4f655a

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

@@ -21,7 +21,6 @@ import android.content.Intent;
 import android.net.Uri;
 import android.util.SparseIntArray;
 
-import com.android.internal.os.BatterySipper;
 import com.android.settingslib.fuelgauge.Estimate;
 
 import java.util.Map;
@@ -54,12 +53,7 @@ public interface PowerUsageFeatureProvider {
     /**
      * Check whether it is type service
      */
-    boolean isTypeService(BatterySipper sipper);
-
-    /**
-     * Check whether it is type system
-     */
-    boolean isTypeSystem(BatterySipper sipper);
+    boolean isTypeService(int uid);
 
     /**
      * Check whether it is type system