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

Change-Id: I151679b04af1a83e050e22293c52e40843617133