Merge "Fix flakiness in LeAdvancedScanningTest lost test" into tm-dev am: 43a5816a am: 6922fbd3 am: d97f1a09 am: 47f45e01

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



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