Merge "PhonePolicy no longer relies on broadcast for service discovery" am:...

Merge "PhonePolicy no longer relies on broadcast for service discovery" am: 85f7c40e am: a7d098f8

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



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