Sanitize Uri.toSafeString() some more.

Bug: 190199986
Test: atest CtsNetTestCases:UriTest
Change-Id: I3689a70cb114099554372e93a0639294fd57bebb
2 files changed