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

Merge "Allow filtering of services" into tm-qpr-dev am: 4cbba8d6 am: 1d452007 am: 2f8c28ce am: fcd75f28

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



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