[automerger skipped] Merge "Allow filtering of services" into rvc-dev am: 9fa258770e -s ours am: 47a0fdbe46 -s ours am: 39043e3884 -s ours am: 78e1c84460 -s ours am: 5b2621ce46 -s ours am: 2f48651667 -s ours am: 72cba2a4aa -s ours

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

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

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