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

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

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



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