[automerger skipped] Use correct address type based on address policy am:...

[automerger skipped] Use correct address type based on address policy am: 2e6b6448 -s ours am: cdaf2c50 -s ours

am skip reason: Merged-In I73f0fb18b6d32d708b081b8afa4e10122a1810c9 with SHA-1 877a2276 is already in history

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



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