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

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



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