Merge "gatt: Fix direct connect" am: 24478087 am: 027a4b90

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



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