Merge "Fix NPE of A11yManagerService#getAccessibilityShortcutService"