Merge "Update the categorize rule for system and app item bucket" into tm-dev am: b0151d1155

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

Change-Id: I3d6d566e151f787374661a1c826690aaebf9b194

tests/robotests/src/com/android/settings/fuelgauge/BatteryDiffEntryTest.java

@@ -349,12 +349,12 @@ public final class BatteryDiffEntryTest {
     }
 
     @Test
-    public void testIsSystemEntry_uidBatteryWithSystemProcess_returnTrue() {
+    public void testIsSystemEntry_uidBatteryWithSystemProcess_returnFalse() {
         final BatteryDiffEntry entry =
             createBatteryDiffEntry(
                 ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
                 /*uid=*/ 1230, /*isHidden=*/ false);
-        assertThat(entry.isSystemEntry()).isTrue();
+        assertThat(entry.isSystemEntry()).isFalse();
     }
 
     @Test