Merge "Clarify how release of offline keys is handled in the MediaDrm API" into jb-mr2-dev