Merge "Floss: Fixing classic keyboard SDP and connection" am: f35543d1 am: 6056a8a0 am: fd0c47a0 am: 121f6789 am: bf98a6c6 am: 868fcd55

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



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