Fix ModifierShortcutTests

Fixes ModifierShortcutTests after I3eb20dc0878f9b7c7ebfb7fc5099a1c1d6cc874f broke them.
Also improves error reporting when it fails.

Fixes: 269790468
Test: atest ModifierShortcutTests
Change-Id: I71c6e9d122d830d64258833d1a01e0cbb043d9c0
2 files changed