[automerger skipped] Merge "Allow filtering of services" into rvc-qpr-dev am: dc357529 -s ours

am skip reason: Merged-In Ib4740ba401667de62fa1a33334c2c1fbee25b760 with SHA-1 a9c75de2 is already in history

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



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