Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev

Author: sganov

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

@@ -558,8 +558,9 @@ public void temporaryEnableAccessibilityStateUntilKeyguardRemoved(
     public void unregisterUiTestAutomationService(IAccessibilityServiceClient serviceClient) {
         synchronized (mLock) {
             // Automation service is not bound, so pretend it died to perform clean up.
-            if (mUiAutomationService != null
-                    && mUiAutomationService.mServiceInterface == serviceClient) {
+            if (mUiAutomationService != null && mUiAutomationService.mServiceInterface != null
+                    && serviceClient != null && mUiAutomationService.mServiceInterface
+                            .asBinder() == serviceClient.asBinder()) {
                 mUiAutomationService.binderDied();
             }
         }