Merge "Remove FDE warning from AccessibilityShortcutChooserActivity"