Merge "Prefer to connect HOGP, rather than HID if Hid-over-GATT service is...

Merge "Prefer to connect HOGP, rather than HID if Hid-over-GATT service is found but not HID service on the remote device." am: 06829ebd am: b72746f0 am: c77647bb am: b91aa563

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



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