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

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

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



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