Merge "Uses identical hostName across all interface" am: 09cad2bc2d am: 7eda0ce0d3

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

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