Merge "bluetooth: if a scan failed to be resumed, don't remove" am: cae0a6c8

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



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