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

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

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