Merge "Fix ScanManagerTest#testDowngradeDuringScanForConcurrencyScreenOff"...

Merge "Fix ScanManagerTest#testDowngradeDuringScanForConcurrencyScreenOff" into main am: 5c241d20 am: 5b55f2fc

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



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