[conflict] Merge "MediaOutputController: Broadcast to connected capable...

[conflict] Merge "MediaOutputController: Broadcast to connected capable devices" into udc-qpr-dev am: 5574a4af am: 0ccadbc6

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



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