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

* commit '87aaf952004af6ae2b226202b3a24d63999b9aef':
  RTSP: add timeout scheme to handle error cases.

Change-Id: I40c57e3dca3528c546bea6ad5d3d9662fbfd6b2f