Merge "Update UriTest for changes to toSafeString" into tm-dev am: d2db378c63

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

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