Merge "Add flags for allowlisting types for new NSD impl" am: 41ecffb378 am: d0c4710f36

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

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