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

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



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