Allow filtering of services am: 066ac6c6 am: decfeebb am: e32aa071 am: 65d8b8ba

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



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