[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: 045b6d8d -s ours am: 219dd725 -s ours

am skip reason: subject contains skip directive

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



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