am 9e2949c6: am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1

* commit '9e2949c6ab4e791b5c20d5e85c3eff62f206a99b':
  Send RTSP control connection keep-alive requests