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

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



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