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

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

Change-Id: I770c5e2a7e89be0f931d28d16dba759afd55924f