am 5dcc2c98: Merge "Only run the wifi display RTSP server on demand, and only...
am 5dcc2c98: Merge "Only run the wifi display RTSP server on demand, and only on the wifi direct" into jb-mr1-dev
* commit '5dcc2c98':
Only run the wifi display RTSP server on demand, and only on the wifi direct