Merge "Fix the memory leak in nsd tests" into main am: 005fb887e6

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

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