Merge "Add rtsp uri test cases for Uri.toSafeString()"
am: 743aa5ddd4

Change-Id: I31dcbc7bde122b1432265b81002ca20e944d7811