Allow filtering of services am: b4cc38feba am: e63277b276 am: c8f6c822e7 am: 46c57d56bf

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

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