Merge "Use CollectionUtils for array concatenation in NsdService" into main am: 23ffbcd2ee

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

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