Merge "Update ShadowDevicConfig" into main
diff --git a/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowDeviceConfig.java b/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowDeviceConfig.java
index dfd0988..acb1dd8 100644
--- a/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowDeviceConfig.java
+++ b/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowDeviceConfig.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.testutils.shadow;
 
-import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.Resetter;
@@ -25,7 +24,7 @@
 import java.util.Map;
 
 @Implements(android.provider.DeviceConfig.class)
-public class ShadowDeviceConfig {
+public class ShadowDeviceConfig extends org.robolectric.shadows.ShadowDeviceConfig {
 
     private static Map<String, String> sPropertyMaps = new HashMap<>();