Revert "Fix atest build error in settings.fuelgauge."

This reverts commit 3b962e3b9d.

Reason for revert: No need to update long -> int

Change-Id: I060b57c5b8c871ccc938ca84fe1aa916293acada

tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntityTest.java

@@ -27,7 +27,7 @@ import org.robolectric.RobolectricTestRunner;
 public final class AppUsageEventEntityTest {
     @Test
     public void testBuilder_returnsExpectedResult() {
-        final int uid = 101;
+        final long uid = 101L;
         final long userId = 1001L;
         final long timestamp = 10001L;
         final int appUsageEventType = 1;

tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java

@@ -169,7 +169,7 @@ public class BatteryTestUtils {
             Context context, long userId, long timestamp, String packageName, boolean multiple) {
         final AppUsageEventEntity entity =
                 new AppUsageEventEntity(
-                        /* uid= */ 101,
+                        /* uid= */ 101L,
                         userId,
                         timestamp,
                         /* appUsageEventType= */ 2,