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

Change-Id: I3f77108d5b739ed5039e95576db44d94f20ad53e