[automerger skipped] Allow filtering of services am: bbc68b5a -s ours am:...

[automerger skipped] Allow filtering of services am: bbc68b5a -s ours am: f0bc2d6f -s ours am: 29093f27 -s ours am: 098ee9e1 -s ours am: 471c2944 -s ours am: d3c22812 -s ours am: 487c9f8b -s ours

am skip reason: Merged-In Ib4740ba401667de62fa1a33334c2c1fbee25b760 with SHA-1 a9c75de2 is already in history

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



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