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

[automerger skipped] Merge "Address consoildation: check dual map first when get device" into tm-qpr-dev am: 4e654189 am: 404371fc -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: I58ff24acc376644bc53003910c5c5ff487a85343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>