Merge "Migrate from old key when combining device and media data" into rvc-qpr-dev am: 20ef7090

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

Change-Id: I3b5e4c05ba07f852e6cf6ff07731d307abad346b