Allow filtering of services am: 066ac6c6 am: decfeebb am: 7a2d0c12

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



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