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

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

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