Merge "Correct java API docs for MediaDrm offline use case" into jb-mr2-dev