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

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

Change-Id: Ib1ebd705179805ab768429f6a70cf2b63810cbb5