[automerger skipped] Merge "Fix LeDevice, ClassicDevice, Device, AdapterConfig...

[automerger skipped] Merge "Fix LeDevice, ClassicDevice, Device, AdapterConfig less than operators" am: ee3cd94f am: e5d7834e am: d77d4ee4 am: 6d56e478 -s ours

am skip reason: Merged-In Ic9f55d5c776a935c49ca889c46e667bc7b961b4f with SHA-1 3d4cb19f is already in history

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



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