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

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



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