Merge "Increase timeout on marking a location provider as disabled" into main

services/core/java/com/android/server/location/provider/proxy/ProxyLocationProvider.java

@@ -59,7 +59,7 @@ public class ProxyLocationProvider extends AbstractLocationProvider implements
     private static final String EXTRA_LOCATION_TAGS = "android:location_allow_listed_tags";
     private static final String LOCATION_TAGS_SEPARATOR = ";";
 
-    private static final long RESET_DELAY_MS = 1000;
+    private static final long RESET_DELAY_MS = 10000;
 
     /**
      * Creates and registers this proxy. If no suitable service is available for the proxy, returns