Allow filtering of services am: 066ac6c6 am: decfeebb am: 7a2d0c12 am: c9e63145 am: 0d3bed58

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



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