Merge "Allow filtering of services" into tm-dev am: 83748aab am: 8b71b241

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



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