Merge "Allow filtering of services" into tm-dev am: 83748aab am: bb932ad0 am: d52e0052 am: bbb33927

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



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