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