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

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



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