Merge "Fix address_with_type inequality comparison operator<" am: 6890f121...

Merge "Fix address_with_type inequality comparison operator<" am: 6890f121 am: d2263f25 am: 61e66ef8

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



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