Merge "Floss: Add constraint to service watcher to match service name" am: 517524b3

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



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