[automerger skipped] Merge "Bass: Support local broadcasts" into tm-qpr-dev am: a47ca87f -s ours

am skip reason: Merged-In I7c9edfd48e38d91d11348b668aa98c4826bf9c1e with SHA-1 e99cdc2b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/19991317



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