Fixes NPE with system shortcuts.

Bug: 160109140
Change-Id: I35c00fc1792fcf11fc61e1876f9184bd5fb309ce
(cherry picked from commit 53925ff9c6558e330aed20a2e406d68474a41247)
2 files changed