Merge "SystemUI: Fix crash from bad notifications" into nyc-mr1-dev
am: 87fab000c5

Change-Id: I91937edd386872e4ae62b56962bc5ed050024715