[automerger skipped] Merge "DO NOT MERGE: Limit the ServiceFriendlyNames" into...

[automerger skipped] Merge "DO NOT MERGE: Limit the ServiceFriendlyNames" into rvc-dev am: 07272cfa am: 48994ad1 -s ours am: bee0f8e5 -s ours am: a64d31ef -s ours

am skip reason: subject contains skip directive

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



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