Merge "frameworks/native: Amend HDCP API" into jb-mr1-dev