Snap for 6646246 from aa79ea1bd964153084e6d2ca304e454032377040 to r-keystone-qcom-release

Change-Id: Id1bff335292a207f071444992e69f4949a90c74c
diff --git a/ServiceManager.cpp b/ServiceManager.cpp
index 165a8d9..85d4974 100644
--- a/ServiceManager.cpp
+++ b/ServiceManager.cpp
@@ -284,6 +284,12 @@
     // Let HidlService know that we handed out a client. If the client drops the service before the
     // next time handleClientCallbacks is called, it will still know that the service had been handed out.
     hidlService->guaranteeClient();
+    forEachExistingService([&] (HidlService *otherService) {
+        if (otherService != hidlService && interfacesEqual(service, otherService->getService())) {
+            otherService->guaranteeClient();
+        }
+        return true;
+    });
 
     // This is executed immediately after the binder driver confirms the transaction. The driver
     // will update the appropriate data structures to reflect the fact that the client now has the