Merge "Add a unique ID to MediaDeviceData" into tm-dev am: a275233f am: 2850b848 am: 2eb7fffb

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



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