Merge "use test app's data folder as filter directory" am: b33ee347 am:...

Merge "use test app's data folder as filter directory" am: b33ee347 am: 49e2256f am: 9b30e029 am: eabf81be

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

Change-Id: Ic0a1ddd1d3a5bc39214058ad23824be893705500