[automerger skipped] Address consoildation: check dual map first when get...

[automerger skipped] Address consoildation: check dual map first when get device am: e8e44206 -s ours am: 6161104a -s ours

am skip reason: Merged-In I6a0a301c7040dd33f62bf5293b2ef5dc923cd28e with SHA-1 7612950d is already in history

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



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