Merge "Expose Uri toSafeString api"
am: 17f9b9bfb6

Change-Id: I26873145668dc451ff1324d7664c386d9223a6c4