Merge "Add a unique ID to MediaDeviceData" into tm-dev am: a275233fc5 am: f2db747d71 am: c839bcdcfe

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

Change-Id: I6856b2aa75eea6c974a7747a0476c00dcb8e5e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>