Merge "Fix error prone of AccessibilityShortcutControllerTest" into tm-qpr-dev