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

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



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