DO NOT MERGE: Limit the ServiceFriendlyNames am: 6b1746ab6f

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

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