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

Change-Id: Iee29739716cd7a264196d0999ada7d4399b30a3e