[automerger skipped] DO NOT MERGE: Limit the ServiceFriendlyNames am: de8f0fef64 -s ours am: c9c86978eb -s ours am: 462c8eb5d8 -s ours am: b3a7fbe29c -s ours am: 32118f6616 -s ours am: 507b0f2dd9 -s ours

am skip reason: subject contains skip directive

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

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