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

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

Change-Id: Ib918a2a3a41957a003e2ca8635d8ac477b42f834