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 am: 44095806 am: 1421319b

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



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