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

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



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