Merge "Fix concurrent modify exception for A11y" am: 2dcd402cdc am: 0b6b68b0ae

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d891d8abc612df1fa2003ad946b98b9d22088aa

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

@@ -766,6 +766,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
             // performs the current profile parent resolution.
             final int resolvedUserId = mSecurityPolicy
                     .resolveCallingUserIdEnforcingPermissionsLocked(userId);
+
+            if (Binder.getCallingPid() == OWN_PROCESS_ID) {
+                return new ArrayList<>(getUserStateLocked(resolvedUserId).mInstalledServices);
+            }
             return getUserStateLocked(resolvedUserId).mInstalledServices;
         }
     }