Merge "Merge "QS: Protect against crash with no icon" into nyc-dev am:...
Merge "Merge "QS: Protect against crash with no icon" into nyc-dev am: 7b945d8d am: 2891acd1" into nyc-mr1-dev-plus-aosp
am: 3f41ed9f
* commit '3f41ed9f':
Change-Id: I8d9f7eb67bbd140c2d23458a12bcb871e33dc0b3