[automerger skipped] Merge "Allow filtering of services" into sc-dev am: 5a9b55cf -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/+/22291002



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