Merge "Update AccessibilityManagerService to use SystemService"