Merge "Deal with non-ASCII characters on resolution info" am: eca1e920e5

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

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