Allow filtering of services am: 066ac6c6 am: decfeebb am: e32aa071

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



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