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