Merge "RTSP: add timeout scheme to handle error cases." into nyc-dev am: 4cf0436f20
am: 1508809cf9

* commit '1508809cf9b1fba562566ae0372e4f3a1a840731':

Change-Id: I9d84bb794922292adc0b68c9dff3fad8281fbc43