Merge "LeAdvancedScanningTests: Cleanup/Consolidation; fail properly." am: fd0cf56e

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



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