Revert "Migrate from old key when combining device and media data"

This reverts commit e9a91b39.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-qpr-dev-plus-aosp&target=aosp_sargo-userdebug&lkgb=6666364&lkbb=6666494&fkbb=6666494, bug b/160879788

Change-Id: Id73fb6a6e8c9d483b730311d8a3116e380968ea1