[automerger skipped] [automerged blank] Allow filtering of services 2p:...

[automerger skipped] [automerged blank] Allow filtering of services 2p: a9c75de2 am: 1408cdaa -s ours am: 7f021a2b -s ours am: c6ddd403 -s ours am: 38e1af3f -s ours am: 3ac589fa -s ours am: 0ec6ca48 -s ours

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

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



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