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

Merge "LeAdvancedScanningTests: Cleanup/Consolidation; fail properly." am: fd0cf56e am: 41f18ffc am: 6ce2d8a3 am: 4516bc97 am: 85c4aba4 am: e8122d26

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



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