Merge "Fix bta_dm_disc stuck in cancelling state" into main am: b0ceadb8

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



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