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

Change-Id: Id9f2f75693c995a3bea9a269648dfa7d3e3a8b0c