Merge "Add NSD_LIMIT_LABEL_COUNT flag" into main am: a96c86d34a

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

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