Merge "Floss: Fixing classic keyboard SDP and connection" am: f35543d1 am:...

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

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



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