Merge "Use custom defined DNS/HTTP port" into main am: 48f8d1892f

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

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