Merge "Add flag to exclude capability propagation when connecting...

Merge "Add flag to exclude capability propagation when connecting MediaBrowser" into tm-dev am: 2b0d0669

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



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