[automerger skipped] Merge "Allow filtering of services" into sc-dev am: 5a9b55cf25 -s ours am: 7cf0e7208f -s ours
am skip reason: Merged-In Ib4740ba401667de62fa1a33334c2c1fbee25b760 with SHA-1 a9c75de2b4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22291002
Change-Id: I62606467de3ba9c22d3d73462b3360fffa189921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: