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: d3157765

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



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