Merge "Avoid going over max service name length when renaming NSD services" am: 3903b1e91d am: 654d8c0735 am: 421f627956

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

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