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

[automerger skipped] Merge "Allow filtering of services" into rvc-qpr-dev am: dc357529 -s ours am: 20ed0011 -s ours am: 0f985d6c -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: I60330979f0a47346eb17c2199d4ac5475cf40cef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>