[automerger skipped] Fix address_with_type inequality comparison operator< am:...

[automerger skipped] Fix address_with_type inequality comparison operator< am: a0e5e448 -s ours am: 115d17f4 -s ours

am skip reason: Merged-In I1412d795330c5ee593daab82efdc3d96324f6f97 with SHA-1 a4bcc65a is already in history

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



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