Merge "DO NOT MERGE Fixing crash in SystemUI fetching task description icons." into nyc-mr2-dev
am: c52a3cb704

Change-Id: If0c3bb685dfd6a13d816c8ef01a291e3988cf5a5