[automerger skipped] [automerge] Avoid going over max service name length when renaming NSD services 2p: 34b5eeae9f am: 5572568b81 -s ours am: aedfa5a2b9 -s ours

am skip reason: Merged-In I077d8abdb91071db62b9618d9918e3a12682aaf4 with SHA-1 de802c8dc4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/23023746

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