[automerger] Fix bug where Launcher crashes when pinned shortcut has no icon. am: 01521b52a8

Change-Id: I6c3ec09a3133d7daa20dba69b1256acbf85d38ed