Merge "Fix AccessibilityShortcutChooserActivityTest for small screens." into main