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

[automerger skipped] Merge "DO NOT MERGE: Limit the ServiceFriendlyNames" into rvc-qpr-dev am: 4de0740b -s ours am: d294e114 -s ours am: 346ad5fa -s ours am: a274175a -s ours am: 93ef7c0d -s ours am: 9814c53d -s ours

am skip reason: subject contains skip directive

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



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