Allow filtering of services am: b4cc38feba am: e63277b276

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

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