[automerger skipped] Merge "Do not change DevType of DUAL devices" into...

[automerger skipped] Merge "Do not change DevType of DUAL devices" into tm-qpr-dev am: aac78f5f -s ours am: ae631bb8 -s ours

am skip reason: Merged-In Ia3c8419c0d330de184417e7820fbf9b36cb8e004 with SHA-1 f3cb4383 is already in history

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



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