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

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

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



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