Merge "Fix invalid keyType translation in MediaDrm.getKeyRequest" into jb-mr2-dev