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

Merge "Merge "[LE] Test cases for Media Output Broadcast Dialog" into tm-dev am: fc02968a am: 1a0c2860" into tm-d1-dev-plus-aosp am: d474767f

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



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