This reverts commit 09905cfa90. Reason for revert: Fixed the crashing issue Change-Id: Ibcfc28a89356d262e67e8842d6bae37e230a70f5
09905cfa90
is set on the Shortcut Bug: 276319271 Test: atest IconCacheTest Flag: N/A Change-Id: I33802ecd23485ba092f842ec3c3d58e2fc286f92