Merge "Cts Tests: Fix enable scan settings race condition" into main am: 9db835b7

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



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