Merge "Revert the flag...

Merge "Revert the flag continue_service_discovery_when_cancel_device_discovery" into main am: 1052452c

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



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