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

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



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