Merge "Enable hdcp for WiFi display" into jb-mr1-dev