Merge \"Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.\" into nyc-dev
am: 4455fc734c

Change-Id: I391ada63a040537925d8b8a8151d0e6d49a6e69b