Merge "use test app's data folder as filter directory" am: b33ee3471d am: 49e2256fb4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910040

Change-Id: Ied9b52ad1fc704943f48ae47e624946a648e2e16