Merge "Fix invalid conn_id in bta_dm" am: 3c4fbafc am: 4ddf52a1 am: 3940978e

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



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