Merge "Fix flakiness in LeAdvancedScanningTest lost test" into tm-dev am: 43a5816a am: 3902a5d1 am: 76df4ec4 am: 7d15cdee

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



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