Merge "[Connection Manager] Fix FFI for AddressWithType" am: 8c50a606 am:...

Merge "[Connection Manager] Fix FFI for AddressWithType" am: 8c50a606 am: c80f7e0c am: e7a9d132 am: 5c90f888

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



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