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

Change-Id: I38333ca0f58cf306ea3978e7f55ddff5fad94cbd
tree: 11adb882773ae57e5da3fc8e61e44e7336617bd3
  1. tests/