[automerger skipped] Merge "Allow filtering of services" into rvc-qpr-dev am: dc357529dc -s ours am: 20ed00115b -s ours am: 0f985d6cfa -s ours am: 29b763ad25 -s ours am: 6fe4ae23fa -s ours am: a1eebaa8ec -s ours am: eeb01cf710 -s ours

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

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

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