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

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

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