Merge "Revert "[LE] Test cases for Media Output Broadcast Dialog"" into tm-dev...

Merge "Revert "[LE] Test cases for Media Output Broadcast Dialog"" into tm-dev am: 7523694a am: c280b478

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



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