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

* commit '945f4eea51d747fc15f1e24791a60d44cb4c96ef':

Change-Id: I62b01c75fc655f5d124595557c060c4a95ea88e0