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

Merge "Migrate from old key when combining device and media data" into rvc-qpr-dev am: 82ec6ed2 am: b13a3c8e

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

Change-Id: Iba40c9afe86614d5f300c136f809fca6740aa7a9