[automerger skipped] Merge "Use test app's data folder as filter directory"...

[automerger skipped] Merge "Use test app's data folder as filter directory" into tm-qpr-dev am: 9e91ab09 -s ours

am skip reason: Merged-In I8e1239d9715e127108ce67365ea8ee4af6663a1b with SHA-1 bfd2d216 is already in history

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



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