Merge "Add test for Uri.toSafeString"
am: 5a6e995881

Change-Id: I8803eccdc3489f923be2bc26151cbff699ea259c
tree: 5ec2162cd8079c1b21ce979a3335fa260dc64672
  1. tests/