Migrate from old key when combining device and media data

Fixes: 160256461
Test: manual - Play Spotify. Dismiss app in overview. Open app in
launcher and select a cast device. Start playing again and check media
player in QS. Verify that a cast icon appears in upper right corner.

Change-Id: I7df9e57853db792ee6589b066dce2bb49f36dffc