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

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

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