Merge "Use private dns port definition in static lib" am: b0c6da3f96 am: 2d265987d6 am: 16412b4b75 am: 9e319922b5

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

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