Merge "Make Uri.toSafeString() also handle 'rtsp'" am: 948d11ffa6
am: a4fadcc192

Change-Id: I5b8a8c6eddcbb8418494909757fe9b55d27acd01