[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: 2df1a82c -s ours am: 61eeaa4e -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: I1e880d8467b0e1e02638f98e1f407d034159c458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>