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

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



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