Merge "Avoid active scanning if device is discovered but not connected" into...

Merge "Avoid active scanning if device is discovered but not connected" into main am: 38a6e1b6 am: f58b772d

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



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