Allow filtering of services am: b4cc38fe am: e63277b2 am: c8f6c822

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



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