Merge "Fix "already registered" error" am: 0df5bbfe90 am: c4b00b8f57

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751360

Change-Id: Icc6dc6d5157c133097e67aad1837c3861fd02080

services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java

@@ -126,7 +126,6 @@ class UiAutomationManager {
             mUiAutomationServiceOwner = owner;
             mUiAutomationServiceInfo = accessibilityServiceInfo;
             mUiAutomationService.mServiceInterface = serviceClient;
-            mUiAutomationService.onAdded();
             try {
                 mUiAutomationService.mServiceInterface.asBinder().linkToDeath(mUiAutomationService,
                         0);
@@ -136,6 +135,8 @@ class UiAutomationManager {
                 return;
             }
 
+            mUiAutomationService.onAdded();
+
             mUiAutomationService.connectServiceUnknownThread();
         }
     }