[automerger skipped] Merge "Add flag to exclude capability propagation when...

[automerger skipped] Merge "Add flag to exclude capability propagation when connecting MediaBrowser" into tm-dev am: 2b0d0669 am: c669802f am: 67f1e993 am: 5fd29b5f am: 4fb3adde am: 0b6217e8 -s ours

am skip reason: Merged-In I7eba9d23897dc3664acc34f72672f98f99811623 with SHA-1 f77a46ef is already in history

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



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