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: I9b53ea9ed539491bcacf3ecf9fbe8c81a10f0fda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>