Bug: 269049175 Fixes: 269049175 Test: atest ShortcutManagerTest1 Change-Id: I106648d5311fa02e7eacbb571bc0481d2023d94f (cherry picked from commit 91e73702)