Merge "Merge "QS: Protect against crash with no icon" into nyc-dev am: 7b945d8d30 am: 2891acd139" into nyc-mr1-dev-plus-aosp
am: 3f41ed9f3f
* commit '3f41ed9f3f2c380fefd950101dc37820cc39c6e7':
Change-Id: I8d9f7eb67bbd140c2d23458a12bcb871e33dc0b3
This commit is contained in: