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

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

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



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