tree 99a49b90a79e47cf488205af652e94785b5b8343
parent 2c6ebe09eea6a7c8cdd01bb06ead50a188666a9a
author thiruram <thiruram@google.com> 1593452834 -0700
committer android-build-team Robot <android-build-team-robot@google.com> 1593476272 +0000

Fixes NPE with system shortcuts.

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