DO NOT MERGE Fixing crash in SystemUI fetching task description icons. am: 452ff6db94
am: 3bbbf8f253  -s ours

Change-Id: Ifa14218c9dbb5d6ec5d6579dc16ba1d427fc9cc8