Merge "Revert "Importing the following changes from gmscore"" am: 018758595d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624810

Change-Id: I62df71b0e69ad11163bfc036e08eb2135d3158c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

service-t/src/com/android/server/connectivity/mdns/ExecutorProvider.java

@@ -42,9 +42,6 @@ public class ExecutorProvider {
     /** Shuts down all the created {@link ScheduledExecutorService} instances. */
     public void shutdownAll() {
         for (ScheduledExecutorService executor : serviceTypeClientSchedulerExecutors) {
-            if (executor.isShutdown()) {
-                continue;
-            }
             executor.shutdownNow();
         }
     }

service-t/src/com/android/server/connectivity/mdns/MdnsDiscoveryManager.java

@@ -238,7 +238,6 @@ public class MdnsDiscoveryManager implements MdnsSocketClientBase.Callback {
         }
         if (perNetworkServiceTypeClients.isEmpty()) {
             // No discovery request. Stops the socket client.
-            sharedLog.i("All service type listeners unregistered; stopping discovery");
             socketClient.stopDiscovery();
         }
     }

service-t/src/com/android/server/connectivity/mdns/MdnsServiceTypeClient.java

@@ -332,7 +332,6 @@ public class MdnsServiceTypeClient {
 
     private void onResponseModified(@NonNull MdnsResponse response) {
         final String serviceInstanceName = response.getServiceInstanceName();
-        sharedLog.i("Handling response from service: " + serviceInstanceName);
         final MdnsResponse currentResponse =
                 instanceNameToResponse.get(serviceInstanceName);