Merge "Use private dns port definition in static lib" am: b0c6da3f96

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

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