Allow filtering of services am: 066ac6c6 am: decfeebb am: 7a2d0c12 am: c9e63145

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



Change-Id: I349eb138f52c1d4391bce9ec7a04f686f1f03fc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>