Avoid crashing when Shortcuts are using reserved string - #7273

Avoid crashing when Shortcuts are using reserved string#7273

jpelgrom merged 2 commits into

mainhome-assistant/android:mainfrom

fix/shortcut_crashhome-assistant/android:fix/shortcut_crashCopy head branch name to clipboard