[automerger skipped] [automerged blank] Allow filtering of services 2p: a9c75de2b4 am: 1408cdaa00 -s ours am: 7f021a2bf2 -s ours am: c6ddd4038c -s ours

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

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

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