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

Merge "Revert "Migrate from old key when combining device and media data"" into rvc-qpr-dev am: d4e95a39 am: 261b4542

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12118834

Change-Id: I362d411175abe745a03062535d7724307f1c082e