[automerger skipped] Merge "DO NOT MERGE: Limit the ServiceFriendlyNames" into rvc-qpr-dev am: 4de0740bf8 -s ours am: d294e11427 -s ours am: 346ad5fada -s ours am: a274175a7b -s ours am: 93ef7c0d25 -s ours am: 3c027f0a61 -s ours

am skip reason: subject contains skip directive

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

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