[conflict] Correct isDirect in BluetoothGatt#connect am: 213409cb am: 5450395a

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


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