Merge "Allow filtering of services" into tm-qpr-dev am: 4cbba8d6

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



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