Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked" am: 14c7e67da8
am: 6006d681ab

Change-Id: I9ed4aca6b9d23a4e8196bdb9595c5e1b8fd2faf4