Allow filtering of services am: b4cc38fe am: e63277b2 am: c8f6c822 am: 16709e9b am: 01c74057 am: bda1b840 am: 93c3bff6 am: a7160830

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



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