diff --git a/services/core/java/com/android/server/pm/dex/PackageDexUsage.java b/services/core/java/com/android/server/pm/dex/PackageDexUsage.java
index 7ac09e373d20a..10760f52a02bc 100644
--- a/services/core/java/com/android/server/pm/dex/PackageDexUsage.java
+++ b/services/core/java/com/android/server/pm/dex/PackageDexUsage.java
@@ -446,15 +446,12 @@ public class PackageDexUsage extends AbstractStatsBase<Void> {
         if (line == null) {
             throw new IllegalStateException("Could not find the loadingPackages line.");
         }
-        // We expect that most of the times the list of loading packages will be empty.
-        if (line.length() == LOADING_PACKAGE_CHAR.length()) {
-            return Collections.emptySet();
-        } else {
-            Set<String> result = new HashSet<>();
+        Set<String> result = new HashSet<>();
+        if (line.length() != LOADING_PACKAGE_CHAR.length()) {
             Collections.addAll(result,
                     line.substring(LOADING_PACKAGE_CHAR.length()).split(SPLIT_CHAR));
-            return result;
         }
+        return result;
     }
 
     /**
diff --git a/services/tests/servicestests/src/com/android/server/pm/dex/PackageDexUsageTests.java b/services/tests/servicestests/src/com/android/server/pm/dex/PackageDexUsageTests.java
index 2829fa7bf83f7..adf4551e79a89 100644
--- a/services/tests/servicestests/src/com/android/server/pm/dex/PackageDexUsageTests.java
+++ b/services/tests/servicestests/src/com/android/server/pm/dex/PackageDexUsageTests.java
@@ -575,6 +575,22 @@ public class PackageDexUsageTests {
         assertPackageDexUsage(mBarBaseUser0);
     }
 
+    @Test
+    public void testEnsureLoadingPackagesCanBeExtended() {
+        String isa = VMRuntime.getInstructionSet(Build.SUPPORTED_ABIS[0]);
+        String content = "PACKAGE_MANAGER__PACKAGE_DEX_USAGE__2\n"
+                + "com.google.foo\n"
+                + "+/data/app/com.google.foo/split-2.apk\n"
+                + "@\n";
+        PackageDexUsage packageDexUsage = new PackageDexUsage();
+        try {
+            packageDexUsage.read(new StringReader(content));
+        } catch (IOException e) {
+            fail();
+        }
+        record(packageDexUsage, mFooSplit2UsedByOtherApps0, mFooSplit2UsedByOtherApps0.getUsedBy());
+    }
+
     private void assertPackageDexUsage(TestData primary, TestData... secondaries) {
         assertPackageDexUsage(mPackageDexUsage, null, primary, secondaries);
     }