Merge "Add a unique ID to MediaDeviceData" into tm-dev am: a275233fc5 am: 2850b8481a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18565545 Change-Id: I3e50382218478b87e46a42adfe6fa7dfc6cb33d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: