[automerger skipped] Merge "BLE: Do not rewrite devtype in BTM_ReadDevInfo()"...

[automerger skipped] Merge "BLE: Do not rewrite devtype in BTM_ReadDevInfo()" into tm-qpr-dev am: 96c874f6 -s ours

am skip reason: Merged-In I9a2ca1210114b60d1f26bf61939a93f6f28f1e16 with SHA-1 10593c49 is already in history

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



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