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: 20ef7090 am: 2c8c8ead

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

Change-Id: Id251bbe250fbeca0490fbb95bf393255d83c6a32