Merge "bta_dm: Don't clear scheduled service discovery on...

Merge "bta_dm: Don't clear scheduled service discovery on BTA_DmSearchCancel()" into tm-qpr-dev am: 2231c8fb

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



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