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

Change-Id: Ia0ab84449f008a331d2234b24e77436f7264c941