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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21359498

Change-Id: I6a3b8840b7653f561f180d2ecbf7202abf04baf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java

@@ -457,6 +457,7 @@ public class AccessibilityShortcutControllerTest {
         }
     }
 
+    @Test
     public void getFrameworkFeatureMap_containsExpectedDefaultKeys() {
         final Map<ComponentName, AccessibilityShortcutController.ToggleableFrameworkFeatureInfo>
                 frameworkFeatureMap =
@@ -489,6 +490,7 @@ public class AccessibilityShortcutControllerTest {
         assertFalse(frameworkFeatureMap.containsKey(ONE_HANDED_COMPONENT_NAME));
     }
 
+    @Test
     public void testOnAccessibilityShortcut_forServiceWithNoSummary_doesNotCrash()
             throws Exception {
         configureShortcutEnabled(ENABLED_EXCEPT_LOCK_SCREEN);