[automerger skipped] DO NOT MERGE: Limit the ServiceFriendlyNames am:...

[automerger skipped] DO NOT MERGE: Limit the ServiceFriendlyNames am: 6b1746ab am: 88bc01ef -s ours am: 66a5cc9a -s ours am: 1688b4a5 -s ours am: 8aec6a9f -s ours am: e9930fba -s ours am: dd45fef7 -s ours

am skip reason: subject contains skip directive

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



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