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 am: 389a715b

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



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