Merge "Fix services being mangled for non-bonding devices" into main am: c3e45330

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



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