Merge "Fix MediaDrm security level APIs"