Merge "use test app's data folder as filter directory" am: 2b819875b8 am: ffc149312e

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1911630

Change-Id: Iff9a926000d713a1d002ad77d310631f86bf45de