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

Change-Id: I1c3b644fe63b34b41a452a72cb1ed03ff1e5fa71