[automerger skipped] DO NOT MERGE: Limit the ServiceFriendlyNames am: de8f0fef -s ours

am skip reason: subject contains skip directive

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



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